HDFS-5188. In BlockPlacementPolicy, reduce the number of chooseTarget(..) methods; replace HashMap with Map in parameter declarations and cleanup some related code.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523400 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9935. set junit dependency to test scope. Contributed by André Kelpe.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523403 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd