YARN-2562. Changed ContainerId#toString() to be more readable. Contributed by Tsuyoshi OZAWA
(cherry picked from commit eb6ce5e97c6a379caf9de0b34cc7770c4447bb1a)
YARN-2635. TestRM, TestRMRestart, TestClientToAMTokens should run with both CS and FS. (Wei Yan and kasha via kasha)

(cherry picked from commit 80d11eb68e60f88e16d7d41edecbddfc935a6b10)
YARN-2468. Enhanced NodeManager to support log handling APIs (YARN-2569) for use by long running services. Contributed by Xuan Gong.

(cherry picked from commit 34cdcaad71cad76c0874a4e5266b4074009d2ffc)
HDFS-7055. Add tracing to DFSInputStream (cmccabe)
(cherry picked from commit 7f6ed7fe365166e8075359f1d0ad035fa876c70f)
HADOOP-11163. MetricsSystemImpl may miss a registered source. Contributed by Chuan Liu.

(cherry picked from commit 69c9af91031f345d9511618877646b8756b17863)
HADOOP-11163. Correct CHANGES.txt.

(cherry picked from commit bbb3b1acc0e8ce10b8689ded2be73b0965f09e52)
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2