Fixes to system property and configuration file property overrides (and environment variables if used)