HDFS-4359. Slow RPC responses from NN can prevent metrics collection on DNs. Contributed by liang xie.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1435299 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4948. Fix a failing unit test - TestYARNRunner.testHistoryServerToken. Contributed by Junping Du


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1435312 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'trunk' of github.com:griddynamics/yhadoop-common into trunk-gd
Merge branch 'trunk-gd' of github.com:griddynamics/yhadoop-common into fb-YAHOO-163-trunk-gd