FELIX-2848 : Saving config file to original location shouldn't add system properties. Applying patch from Carl Hall