svn merge -c 1465009 FIXES: YARN-525. make CS node-locality-delay refreshable. Contributed by Thomas Graves