conducting hostgroup searches based on the environment, if appropriate.
Merge branch 'COOK-2150'