svn merge -c 1586039 from trunk for HDFS-6204. Fix TestRBWBlockInvalidation: change the last sleep to a loop.


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