Merge changes Ib119e6f9,I73e312fd

* changes:
  ConfigurationMap: Remove unused elements and methods
  WifiConfigManager: Optimize scan result to config lookup
tree: ccdbcaa4dce367443bc2bd447f5f893ed4ece65d
  1. service/
  2. PREUPLOAD.cfg