Merge up 4.7.x #4510

Job	Run time
build_matrix	4m 4s
build (17, test-suite-annotation-remapper:nativeTest)	7m 28s
build (17, test-suite-http-server-tck-netty:nativeTest)	7m 40s
build (17, test-suite-http2-server-tck-netty:nativeTest)	10m 28s
build (17, test-suite-kotlin-graalvm:nativeTest)	7m 37s
build (17, test-suite-logback-graalvm:nativeTest)	6m 24s
build (17, test-suite-netty-ssl-graalvm:nativeTest)	7m 51s
build (21, test-suite-annotation-remapper:nativeTest)	7m 25s
build (21, test-suite-http-server-tck-netty:nativeTest)	7m 35s
build (21, test-suite-http2-server-tck-netty:nativeTest)	9m 0s
build (21, test-suite-kotlin-graalvm:nativeTest)	7m 42s
build (21, test-suite-logback-graalvm:nativeTest)	7m 1s
build (21, test-suite-netty-ssl-graalvm:nativeTest)	7m 44s
	1h 37m 59s

Provide feedback