Refs #5217: Initial location to declare and load permissions.
Fixes #5230: Adds CRUD permissions for GPG Keys.
Merge pull request #3985 from ehelms/fixes-5230

Fixes #5230: Adds CRUD permissions for GPG Keys.
Merge remote-tracking branch 'upstream/master' into roles
Fixes #5260 - adding CRUD permissions for Sync Plans.
Merge pull request #3997 from waldenraines/sync-plan-roles

Fixes #5260 - adding CRUD permissions for Sync Plans.
Merge pull request #4000 from waldenraines/roles

Merge remote-tracking branch 'upstream/master' into roles
Merge remote-tracking branch 'upstream/master' into roles
Merge pull request #4012 from waldenraines/roles

Merge remote-tracking branch 'upstream/master' into roles
Fixes # 5437 - Env controller cleanup

Removing unused controller methods from the environments controller.
Also wiping out unused tests.
Fixes #5416 - adding CRUD permissions for activation keys.
Merge pull request #4003 from waldenraines/activation-keys-roles

Fixes #5416 - adding CRUD permissions for activation keys.
Merge pull request #4014 from parthaa/env-cleanup

Fixes # 5437 - Env controller cleanup
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
Merge branch 'master' of https://github.com/Katello/katello into roles
Merge pull request #4027 from waldenraines/roles

Merge remote-tracking branch 'upstream/master' into roles
Fixes #5261: Adds CRUD permissions for Products and Repositories.
Refs #5377 - Fixing the reset task to use apache now

The pulp-manage-db script must now be run as apache and not root.
Merge pull request #4031 from daviddavis/temp/20140501133003

Refs #5377 - Fixing the reset task to use apache now
Merge pull request #4017 from ehelms/fixes-5261

Fixes #5261: Adds CRUD permissions for Products and Repositories.