Engine: engine-test-cp - candlepin glue tests
Merge pull request #3312 from thomasmckay/engine-test-cp

Engine: engine-test-cp - candlepin glue tests
Engine: Fixes #3621 - ElasticSearch tests