Merge pull request #2029 from jeffreythomas/5.2

[CLEANUP] -Fixing broken jmeter tests.
[BACKLOG-801] - restConfig.properties being generated multiple times