Engine: Refs #3615 - Fix repo discovery test
Engine: Fixes #3621 - ElasticSearch tests
Engine: Fixing puppet and pulp sync tests, refs #3585
Engine: engine-test-distrbutor - distributor model test
Merge pull request #3360 from daviddavis/temp/20131111102216

Engine: Fixes #3621 - ElasticSearch tests
Merge pull request #3355 from daviddavis/temp/20131109095910

Engine: Refs #3615 - Fix repo discovery test
Merge pull request #3337 from daviddavis/temp/20131107121837

Engine: Fixing puppet and pulp sync status tests, refs #3585
Engine: Removing redundant call to activation key spec
Merge pull request #3363 from daviddavis/temp/20131111134829

Engine: Removing redundant test call
Engine: Fixes #3632: Cleans up spec/helpers.
Engine: Fixes #3634 - Fix spec routing tests
Merge pull request #3368 from daviddavis/temp/20131112085333

Engine: Fixes #3634 - Fix spec routing tests
Merge pull request #3367 from ehelms/engine-spec-helpers

Engine: Fixes #3632: Cleans up spec/helpers.
Engine: Fixes #3613: Enabling all UI controller spec tests.
Engine: Refs #3584 - Simplifying test task glue files
Merge pull request #3365 from ehelms/engine-spec-ui-controllers

Engine: Fixes #3613: Enabling all UI controller spec tests.
Merge pull request #3369 from daviddavis/temp/20131112103503

Engine: Refs #3584 - Simplifying test task glue files
Engine: models: include_root_in_json=false for all katello models

This change is to ensure that the root node (e.g. 'user', 'system'...etc)
is not included in results generated via 'as_json'.

This change will primarily impact the v1 APIs which return data
via as_json; however, it will not impact the v2 APIs that are
generted via rabl.

One of the reasons this change is necessary is to ensure compatability
with the subscription-manager which does not expect to receive named
objects.
Merge pull request #3362 from thomasmckay/engine-test-distrbutor

Engine: engine-test-distrbutor - distributor model test
Engine: models: test fixes for: include_root_in_json=false