896147 - Notify user of keyname presence when adding
default_system_info to an org
making tests happy
923112 - Katello Nightly : Add,Apply.Remove default custom info
keynames for subscriptions that are set at the organization level failed
via Cli
(cherry picked from commit ad57ee9a431321aeb64e68d805abeb5ec1c93c3d)

Conflicts:
	src/spec/controllers/api/organization_default_info_controller_spec.rb
super happy tests
Make oauth working

Use Rack::Request (supported by the oauth gem) instead of
ActionDispatch::Request (not supported by the gem).
Include candlepin info about pools in activation keys details

Needed by foreman-katello-engine to display activation keys details.
Comps - Adding httpd packages to comps for Fedora18.
Merge pull request #1780 from komidore64/default_info_dupe

two bug fixes around default_info along with tests
Merge pull request #1803 from ehelms/httpd-comps

Comps - Adding httpd packages to comps for Fedora18.
Merge pull request #1784 from iNecas/foreman-katello-plugin-support

Changes needed for foreman-katello-engine to work
Spec - Adding requires on Apache 2.4.4 on Fedora 18.
Merge pull request #1805 from ehelms/spec-update

Spec - Adding requires on Apache 2.4.4 on Fedora 18.
Ignoring Gemfile32.lock

When setting bundle's gemfile to Gemfile32, it creates a Gemfile32.lock which
does not get ignored by git.
Merge pull request #1807 from daviddavis/gemfile_locks

Ignoring Gemfile32.lock