Merge "Move ScanResultMatchInfo to its own class" into oc-dr1-dev
tree: 94b87f33190f9dd00c6209416449e5c6f988e739
  1. service/
  2. PREUPLOAD.cfg