Requiring content views for systems and activation keys

This is @bbuckingham's pull request (#2201) but I addressed my feedback and rebased.