deployment fixes to support local_settings overrides properly