Merge pull request #2036 from jeffreythomas/dev

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