Plugins » Katello

Merge branch 'master' into cv-rework

Conflicts:
app/models/katello/content_view.rb
app/models/katello/content_view_definition.rb
app/models/katello/content_view_version.rb
app/models/katello/kt_environment.rb
app/views/katello/content_view_definitions/_publish.html.haml
engines/bastion/app/assets/stylesheets/bastion/nutupane.less
lib/katello/plugin.rb
lib/katello/tasks/test.rake