Merge changes from topic "configstore_integrity_same_file" into qt-qpr1-dev
am: 83a7b92134

Change-Id: I2050cf8e35f25b24a5acc1f809dc0f81f57237c3
tree: fc39e4a4f2fb508f807b95a76ea1ab0123fe308a
  1. service/
  2. PREUPLOAD.cfg