Merge branch 'master' of...

Merge branch 'master' of https://ec.europa.eu/digital-building-blocks/code/scm/edelivery/smp into development

 Conflicts:
	pom.xml
	smp-angular/package-lock.json
	smp-angular/pom.xml
	smp-api/pom.xml
	smp-docker/compose/tomcat-mysql-smp-sml/runCompose.sh
	smp-docker/compose/weblogic-oracle/runCompose.sh
	smp-docker/images/build-docker-images.sh
	smp-docker/images/tomcat-mysql/Dockerfile
	smp-docker/images/weblogic-12.2.1.3-smp/container-scripts/datasource.properties.oracle
	smp-docker/images/weblogic-12.2.1.3-smp/container-scripts/deploySMPToDomain.sh
	smp-docker/pom.xml
	smp-parent-pom/pom.xml
	smp-server-library/pom.xml
	smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataIntegrationTest.java
	smp-soapui-tests/pom.xml
	smp-soapui-tests/soapui/SMP4.0-Generic-soapui-project.xml
	smp-webapp/pom.xml
	smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/SpringSecurityExceptionHandler.java
	smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb-drop.ddl
	smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb.ddl
	smp-webapp/src/main/smp-setup/database-scripts/oracle10g-drop.ddl
	smp-webapp/src/main/smp-setup/database-scripts/oracle10g.ddl
	smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SignatureValidatorTest.java
	smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ServiceGroupBodyUtil.java