Esap gateway query

Nico Vermaasrequested to merge
esap-gateway-query into master

merging with master to not get too far ahead.

Merge request reports