Merge changes from topic "PPRL.190205.001"

* changes:
  Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
  DO NOT MERGE - Merge PPRL.190205.001 into master
tree: e045c25b9e103fefc785e94406e1225a91aa9df8
  1. core/
  2. services/
  3. tests/