Merge "P2P: Fix cancelServiceDiscovery mis-cast" into oc-dev
tree: 3d1f790781a6e6f5f5ed79b001550e8ae65da8a3
  1. service/
  2. PREUPLOAD.cfg