Merge pull request #4561 from dustint-rh/rm_default_environment_in_sys_api
Fixes #7025 - replace default_environment in sys
Merge pull request #4561 from dustint-rh/rm_default_environment_in_sys_api
Fixes #7025 - replace default_environment in sys