Merge remote-tracking branch 'origin/master' into dependency-upgrade

Conflicts:
	provider/indexer-ibm/pom.xml
33 jobs for dependency-upgrade in 53 minutes and 19 seconds (queued for 6 seconds)
latest