Merge changes I35d96419,I8ce5b2e6 into oc-dr1-dev

* changes:
  [AWARE] Add debug hooks to obtain count of event callbacks
  [AWARE] Mask passphrase/pmk information
tree: bab51dbf11aa89c756b315151ea7e027f87f70be
  1. service/
  2. PREUPLOAD.cfg