Merge branch 'tobias.steiner-master-patch-33097' into 'master'

Update elastic search version

See merge request !3
2 jobs for master in 4 minutes and 36 seconds (queued for 5 seconds)