Upgrade to Elasticsearch 1.2.0

Change-Id: I50efccffe50f0abde9593390dc6d730b2f2f4c13
Fix phrase_as_terms on different fields

Fixes a problem where if some fields set phrase_as_terms and some don't then
the first field to be highlighted "wins".

Change-Id: I8674d65e085a691aeacc1ba52f62576028f04dc8
Merge "Upgrade to Elasticsearch 1.2.0"