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

Change-Id: Iec84b6057fc5015daefd9d3da8a1c85e62e0be96
tree: cc6989a38ca40bcd420a3fcceeab9f2db6e7f42b
  1. service/
  2. PREUPLOAD.cfg