Merge remote-tracking branch 'upstream/master' into cv-rework-merge-master
Merge pull request #3635 from daviddavis/cv-rework-merge-master

Content Views: Merging in master branch
Content Views: Removing more old models

Content Views: Removing more old content view definition models. Also, got
tests to pass.
Merge pull request #3626 from daviddavis/temp/20140127142214

Content Views: Removing more old models
Content Views: Working on the V2 API
Content Views Rework: merging filters & filter rules, CRUD support

The following is a high-level summary of the changes:
1. Merge filter and filter rules together.  With these changes,
   there will be base filter class that the filter types will
   derive from (i.e. package, package group, erratum, puppet module).
   Each filter may have multiple 'parameters' associated with it.
2. Support elastic search indexing of filters
3. Provide v2 api support for CRUD (create/review/update/delete) actions

This commit does not address the following:
- Updates to content view publish/refresh to use the updated models
  (anticipate more changes needed  there)
- 'Green' tests

Both of the above will be addressed in separate commits.
Content Views Rework: filters: updating tests
Merge pull request #3638 from bbuckingham/cv-rework-filters

Content Views Rework: merging filters & filter rules, CRUD support
Merge pull request #3633 from daviddavis/temp/20140128110212

Content Views: Working on the V2 API
use the yum_clone distributor during CV publish

if a repository has no filters applied, then we can just use
the yum_clone distributor for metadata generation and save a few minutes