Merge branch 'master' into 'esap-gateway-query'

# Conflicts:
#   esap/query/templates/query/index.html
2 jobs for esap-gateway-query in 41 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #97830
docker-build-branch-query

00:00:41

 
  Deploy
manual #97831
allowed to fail manual
docker-deploy-branch-query