Bug 973774: Updates to ensure content view and environment selection
are properly in sync with one another.
990478: Add query param to filter out marketing products
Merge pull request #3066 from daviddavis/temp/20131001120824

990478: Add query param to filter out marketing products
Merge pull request #3058 from ehelms/bug-973774

Bug 973774: Updates to ensure content view and environment selection