Changes to allow environment overrides in a manner consistent with EL distros