YARN-525. make CS node-locality-delay refreshable. Contributed by Thomas Graves


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1465013 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5007. fix coverage org.apache.hadoop.mapreduce.v2.hs (Aleksey Gorshkov via tgraves)

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