Merge remote-tracking branch 'origin/master' into upgrade-log4j-2.17.1

Conflicts:
	NOTICE
	pom.xml
20 jobs for upgrade-log4j-2.17.1 in 86 minutes and 47 seconds (queued for 4 seconds)