Bug 973774: Updates to ensure content view and environment selection

are properly in sync with one another.