[#eng-5883] Upgrade to Elasticsearch 1.0.1
Merge branch 'eng-5883-upgrade-elastic-search'