Merge pull request #2037 from jeffreythomas/5.2

[BACKLOG-801] - restConfig.properties being generated multiple times
[BACKLOG-801] - restConfig.properties being generated multiple times