Merge "Make bootclasspath srcjar available to make" into main