Merge remote-tracking branch 'origin/master' into aws-integration

Conflicts:
	provider/legal-aws/pom.xml
28 jobs for aws-integration in 41 minutes and 51 seconds (queued for 4 seconds)