Merge "Enable redefining Bootclasspath classes"