Merge changes I3934b68b,Ic1b3a97b into oc-dr1-dev

* changes:
  [AWARE] Restrict number of data interfaces and paths
  [AWARE] Create a locally maintained peer ID instead of firmware ID
tree: 18e091f88a7b38cfcb0b585f32e68b3f086853af
  1. service/
  2. PREUPLOAD.cfg