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.
add ruby193-puppet and its deps
Fixing output from rpm ruport check
Katello Configure - Updates Pulp and Katello Apache configuration
templates to include Fedora 18 configuration.
Merge pull request #1790 from daviddavis/ruport_fix

Fix ruport output
Merge pull request #1788 from xsuchy/pull-req-ruby193-puppet

add ruby193-puppet and its deps
Merge pull request #1796 from ehelms/f18-updates

Katello Configure - Adds HTTPD templates for pulp and Katello that
bumping runcible requirement
Comps - Adding httpd packages to comps for Fedora18.
cassette update
Merge pull request #1802 from jlsherrill/runcible_update

bumping runcible requirement
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
Content views: archiving content defintions

Started working on archiving defintions in preparation of creating/copying
definitions from content views.