Merge branch 'GPII-564'

* GPII-564:
  GPII-564: Renamed the config file for built in windows functionality to something more descriptive
  GPII-564: Added txt files making it clear what the status are of the duplicated NP sets, the config files and the acceptanceTests folder of the preferences dir
  GPII-564: Moved acceptance test config file to a 'config' dir
  GPII-564: Undid moving of screenreader_nvda.json NP set, to avoid breaking the Linux acceptance tests
  GPII-564: Added preferences sets for the acceptance tests for built in functionality in windows
  GPII-564: Moved config file setting up local install with preferences from 'acceptanceTests' dir
  GPII-564: Moved (or copied) the relevant preferences sets to an acceptanceTests folder. Created new solution payload for NVDA only and moved to new acceptanceTests folder in the deviceReporter dir
GPII-564: Corrected file permissions of added files
GPII-455: Updating with latest master

Merge remote-tracking branch 'upstream/master' into GPII-455
GPII-455: Added a txt file describing the acceptance test. Changed mode to 0644 as requested