Merge branch 'develop' of git.science.uu.nl:datastrophe/microservices-backbone/query-service into develop