Merge "Revert "Revert "Modification to the way boot classpath resources are loaded"""