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

Conflicts:  spec/controllers/api/v1/systems_controller_spec.rb