[BACKLOG-755] - fix for nightly build
Merge pull request #2034 from krivera-pentaho/dev

[BACKLOG-755] - fix for nightly build
[BACKLOG-801] - restConfig.properties being generated multiple times
Merge pull request #2036 from jeffreythomas/dev

[BACKLOG-801] - restConfig.properties being generated multiple times
[BACKLOG-801] - restConfig.properties being generated multiple times
Merge pull request #2038 from jeffreythomas/dev

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