Merge branch 'master' of https://github.com/Katello/katello into master-to-roles

Conflicts:
	app/controllers/katello/api/v1/content_uploads_controller.rb
	app/controllers/katello/api/v1/environments_controller.rb
	app/controllers/katello/api/v1/puppet_modules_controller.rb
	app/controllers/katello/api/v1/systems_controller.rb
	app/controllers/katello/api/v2/activation_keys_controller.rb
	app/controllers/katello/api/v2/content_view_filters_controller.rb
	app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb
	app/controllers/katello/api/v2/content_view_versions_controller.rb
	app/controllers/katello/api/v2/content_views_controller.rb
	app/controllers/katello/api/v2/environments_controller.rb
	app/controllers/katello/api/v2/organizations_controller.rb
	app/controllers/katello/api/v2/products_controller.rb
	app/controllers/katello/api/v2/repositories_controller.rb
	app/controllers/katello/api/v2/subscriptions_controller.rb
	app/controllers/katello/api/v2/sync_controller.rb
	app/controllers/katello/api/v2/sync_plans_controller.rb
	app/controllers/katello/api/v2/systems_controller.rb