Merged config.json.sample-windows and config.json.sample files
Merge branch 'merged-config' into buildbot