Merge changes Ia5c42c7c,Ie8362f6d into oc-dr1-dev

* changes:
  WifiScoreReport - refactor existing scorers
  WifiScoreReport - separate scoring classes
tree: 693b373c7ac68b94664123db66789509122c6a2a
  1. service/
  2. PREUPLOAD.cfg