am 3db17f7f: Merge "Revert "Revert "Modification to the way boot classpath resources are loaded"""

* commit '3db17f7fcd2a93cfeead9874696a8901423aba6d':
  Revert "Revert "Modification to the way boot classpath resources are loaded""