Merge branch '760-elasticsearch-upgrade' into 'v1.0.6'

Resolve "ElasticSearch upgrade for v1.x"

See merge request !584
17 jobs for v1.0.6 in 45 minutes and 52 seconds (queued for 2 seconds)