fixes #5028 - changing organization_id label to ID
refs #5028 - fixing tests
refs #5028 - fixing all the apipie directives
refs #5028 - switching org lookup to `find_by_id`
Merge pull request #4028 from komidore64/rmi5028

fixes #5028 - changing organization_id label to ID
refs #5601, #5603 - host collections - updates to support cli

This commit contains a couple of minor changes to help
support the cli host-collection update, add-content-host
and remove-content-host commands.  They will also be useful
for API users.
Fixes #5659 - String Extract
Merge pull request #4067 from bkearney/bkearney/string_extract

Fixes #5659 - String Extract
Merge pull request #4065 from bbuckingham/issue-5601

refs #5601, #5603 - host collections - updates to support cli
Fixes #5422 - don't orchestrate user at login every login
Merge pull request #4070 from iNecas/5422

Fixes #5422 - don't orchestrate user at login every login
Merge branch 'master' of https://github.com/Katello/katello into master-to-roles

Conflicts:
	app/controllers/katello/api/v1/environments_controller.rb
	app/controllers/katello/api/v2/environments_controller.rb
	app/controllers/katello/api/v2/systems_controller.rb
	test/controllers/api/v2/products_controller_test.rb
	test/controllers/api/v2/sync_controller_test.rb
	test/controllers/api/v2/systems_bulk_actions_controller_test.rb
	test/controllers/api/v2/systems_controller_test.rb
Fixes #5700: Fixes rubocop error introduced by PR 4070.
Fixes #5698, specify absolute URLs instead of relative in menu.
Merge pull request #4074 from ehelms/fixes-5700

Fixes #5700: Fixes rubocop error introduced by PR 4070.
Merge remote branch 'origin/master' into master-to-roles
Merge pull request #4077 from waldenraines/5698

Fixes #5698, specify absolute URLs instead of relative in menu.
Merge pull request #4072 from ehelms/master-to-roles

Master to roles
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.