HDFS-6587. Bug in TestBPOfferService can cause test failure. (Contributed by Zhilei Xu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1604899 13f79535-47bb-0310-9956-ffa450edef68