am e41d5b91: Merge "Modification to the way boot classpath resources are loaded"

* commit 'e41d5b91fc53a5116584845b4ec6373588e77789':
  Modification to the way boot classpath resources are loaded