svn merge -c 1245637 from trunk to 0.23 FIXES HADOOP-8054 NPE with FilterFileSystem (Daryn Sharp via bobby)