Merge "Support conditional removal of oahl from bootclasspath"