Merge "Abort scan before connection" into oc-dev
tree: 7fed40722e8b0498cb6a032e4496ef1ef392f122
  1. service/
  2. PREUPLOAD.cfg