Fix the provides statement so it is correct for SCL Builds as well
api v2 environments - only looking up by their numerical IDs
environments model - trivial spacing changes
ak-api - working on system groups for activation keys

ak-api - clean up based on pull-request comments

ak-api - updated to use present?

ak-api - more comments addressed
add comps file for RHEL 5 client
Merge pull request #3651 from komidore64/find-env-yank

for the time being, we're only going to look up katello entities by their IDs
Merge pull request #3675 from thomasmckay/ak-api

ak-api - working on system groups for activation keys
Merge pull request #3648 from jmontleon/fixsclprovides

Fix the provides statement so it is correct for SCL Builds as well
Merge pull request #3696 from jmontleon/add-rhel5-client-comps

add comps file for RHEL 5 client
Removed custom providers from the UI
Added "Anonymous" providers on the backend that are automatically created
removed API docs for provider create and delete
Merge pull request #3700 from Katello/jconnor-remove-content-providers

Jconnor remove content providers
Build: Setting the compass-rails version since the newest version (1.1.4) breaks
the build and fixing a single broken JS test.
Merge pull request #3701 from ehelms/compass-rails-version

Setting the compass-rails version since the newest version (1.1.4) break...
Merge remote-tracking branch 'upstream/master' into cv-merge-master

Conflicts:
	config/routes/api/v2.rb
Merge pull request #3702 from daviddavis/cv-merge-master

Merging in master
Content Views Rework: add ability to associate puppet modules with a content view

This commit contains several changes to support allowing a user to associate
puppet modules with a content view.  Note: this does not 'create' puppet
modules in Katello, it only associates existing modules with the view.

First, the v2 api has been updated for listing out the puppet modules in
a repository as well as for retrieving details on a puppet module. This is
to help the user in identifying and selecting modules.

Second, new v2 apis (model/schema...) have been added to allow the user
to add/remove/view/update puppet module associations with the content view.

When associating a puppet module with a content view, the user will have
2 options:

1. provide the UUID (aka pulp ID) when performing the add.  This will
   associate a specific puppet module (name/author/version) with the
   content view.

2. provide a puppet module name+author when performing the add.  This
   will indicate that the 'latest' version of this puppet module will
   be associated with the content view.
Merge pull request #3679 from bbuckingham/cv-rework-puppet

Content Views Rework: add ability to associate puppet modules with a content view
Updated content view node publish logic

One of the parts effectively slowing down the publish is the generation
of the node metadata. This code moves the node publish operation to its
own task and separates it from the main publish operation to run in
parallel and not affect completion time.
Fixed a node env join issue