Engine: Fixes #3621 - ElasticSearch tests
Merge pull request #3360 from daviddavis/temp/20131111102216

Engine: Fixes #3621 - ElasticSearch tests