Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway

# Conflicts:
#	pom.xml