Merge branch 'master' of https://github.com/Katello/katello into bastion-merge

    Conflicts:
        app/assets/stylesheets/widgets/nutupane.scss
        app/views/systems/index_nutupane.html.haml