Merge branch 'es7' into 'master'

Upgrade elastic to 7

See merge request !2
2 jobs for master in 2 minutes and 53 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #19238
build

00:02:07

 
  Release
passed #19239
release

00:00:45