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