am 37bd81af: Merge "Fix for boot classpath handling of directory entries"

* commit '37bd81afbc146ab0f6b2c5c58c67853284d59c2e':
  Fix for boot classpath handling of directory entries