GPII-363: Removed all entries for UI options from NP sets, solution registry and device reporter data
Merge branch 'master' into GPII-363

Conflicts:
	testData/deviceReporter/installedSolutions.json
Merge remote-tracking branch 'michelled/GPII-363'

* michelled/GPII-363:
  GPII-363: Removed all entries for UI options from NP sets, solution registry and device reporter data

Conflicts:
	testData/preferences/carla.json