fixes #5951 - adds environment hint to content host registration, BZ1085252

fixes #5951 - adds environment hint to content host registration, BZ1085252
Merge pull request #4159 from cfouant/cfouant-branch-0527

fixes #5951 - adds environment hint to content host registration, BZ1085252