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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567947 13f79535-47bb-0310-9956-ffa450edef68