Merge "Remove core-simple from the boot classpath"