Merge branch 'develop' of https://labs.etsi.org/rep/oop/code/open-exposure-gateway into develop