HDFS-5154.  Fix TestBlockManager and TestDatanodeDescriptor after HDFS-4987.  Contributed by Junping Du


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