Merge pull request #4567 from dustint-rh/fix_find_only_environment
Fixes #7045 - fix location undefined for user
Merge pull request #4567 from dustint-rh/fix_find_only_environment
Fixes #7045 - fix location undefined for user