[BACKLOG-207] - Only overriding startup.properties in client
Merge pull request #5 from brosander/BACKLOG-207

[BACKLOG-207] - Only overriding startup.properties in client