svn merge -c 1567946 merging from trunk to branch-2 to fix:HDFS-5904. TestFileStatus fails intermittently.