YARN-2404. Removed ApplicationAttemptState and ApplicationState class in RMStateStore. Contributed by Tsuyoshi OZAWA
(cherry picked from commit 5805a81efbc024024d8172489dfdc6cf77879416)
MAPREDUCE-5568. Fixed CompletedJob in JHS to show progress percentage correctly in case the number of mappers or reducers is zero. Contributed by MinJi Kim
(cherry picked from commit 78f7cdbfd6e2b9fac51c369c748ae93d12ef065a)
HADOOP-11300. KMS startup scripts must not display the keystore / truststore passwords. Contributed by Arun Suresh.

(cherry picked from commit 56f3eecc129486d3297d082d9b97f26b40d0a2c6)
HDFS-7097. Allow block reports to be processed during checkpointing on standby name node. (kihwal via wang)

(cherry picked from commit f43a20c529ac3f104add95b222de6580757b3763)
HADOOP-11173. Improve error messages for some KeyShell commands.

(cherry picked from commit fae266bbf19e44a2595fa62366d9b65e7c996df8)
YARN-2906. CapacitySchedulerPage shows HTML tags for a queue's Active Users. Contributed by Jason Lowe
(cherry picked from commit 8a7ca13b13c0c3f008a6490cc96d4d48a051d1f7)
YARN-2188. [YARN-1492] Client service for cache manager. (Chris Trezzo and Sangjin Lee via kasha)

(cherry picked from commit 834b3b98e7ecc4bfe93c7dd1a9e928e9653cf138)
HDFS-7440. Consolidate snapshot related operations in a single class. Contributed by Haohui Mai.
HDFS-7440. Update CHANGES.txt for HDFS-7440.
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2