Environment config file selection made consistent

Cherry picked commit a0e2a9847720dd394f3cf1f78547ac1055d95222