Content Views: Merging in master branch

Note: This will not pass in Jenkins since the tests are currently failing in cv-rework (see https://github.com/Katello/katello/pull/3626).