Merge remote-tracking branch 'origin/esap-gateway-query' into esap-gateway-query

# Conflicts:
#	esap/deploy/run_esap.sh
2 jobs for esap-gateway-query in 2 minutes and 50 seconds
Status Job ID Name Coverage
  Build
passed #170982
docker-build-branch-query

00:02:50

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