Katello/katello — pull request #4027 by waldenraines (2014-05-01 14:12:12+00:00)
Title: Merge remote-tracking branch 'upstream/master' into roles

Conflicts:
app/controllers/katello/environments_controller.rb
app/controllers/katello/gpg_keys_controller.rb
app/controllers/katello/sync_plans_controller.rb
config/routes.rb
engines/bastion/app/controllers/bastion/bastion_controller.rb