Bug 973774: Updates to ensure content view and environment selection
are properly in sync with one another.
Merge pull request #3058 from ehelms/bug-973774

Bug 973774: Updates to ensure content view and environment selection