refs #5028 - correctly display the org's label for suscription manager
Fixes #5613 - Fix unhandled sys errors BZ1084722

In hammer-cli-katello's system subcommand, when system-id given is
invalid, only a Bad Request message is presented to the user. This is
because the error messages being returned when a system is not found are
not being rendered using app/lib/katello/api/v2/error_handling.rb.

* Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1084722
fixes #5706 - host collection foreign keys - fix rollback
Merge pull request #4068 from komidore64/rmi5028-register-hosts

refs #5028 - correctly display the org's label for suscription manager
Refs #4478 - Add support for localized API docs
Merge pull request #4080 from bbuckingham/issue-5706

fixes #5706 - host collection foreign keys - fix rollback
Merge pull request #4063 from mbacovsky/4478_localized_api

Refs #4478 - Add support for localized API docs
Merge pull request #4059 from dustint-rh/bz1084722_hammer_queries_for_missing_system_id

Fixes #5613 Fixes problem with hammer only returning Bad Access when sys...
Refs #5217: Fix activation key destroy.

This was introduced with merges from master and would cause errors
on deletion since the show rabl file sends attributes stored in Candlepin.
And since the activation key has been deleted at that point from Candlepin,
the object is no longer available.
Fixes #5711 - Doc id in ContentHosts update

Hammer-cli-katello is unable to recognize --id param for in the
subcommand content-host update. Apipie param 'id' is missing for
the update in systems controller.
Merge pull request #4084 from dustint-rh/add_apipie_id_param_to_content_host_update

Fixes #5711 - Doc id in ContentHosts update
merging for @dustint-rh thanks!
Refs #5217: Fix content host menu item and add organization scoping.
Merge pull request #4088 from ehelms/refs-5217

Refs #5217: Fix activation key destroy.
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
Merge pull request #4093 from ehelms/master-to-roles

Refs #5217: Master to roles
Merge pull request #4092 from ehelms/refs-5217

Refs #5217: Fix content host menu item and add organization scoping.
Fixes #5682 - Handle Lifecycle env read perms better

1) Made env index call prune the return list based on read perms
2) Made the env page in the UI display paths appropriately based on read
perms
3) Updated the create env call to require read access on the prior
environment before one can create.