HDFS-5437. Fix TestBlockReport and TestBPOfferService failures.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1537365 13f79535-47bb-0310-9956-ffa450edef68