-noverify isn't supported in _JAVA_OPTIONS, use -XX:-UseSplitVerifier instead
Merge remote-tracking branch 'origin/2.3.x' into 2.4.x
Merge remote-tracking branch 'origin/2.4.x'