MAPREDUCE-5873. Shuffle bandwidth computation includes time spent waiting for maps. Contributed by Siqi Li
(cherry picked from commit b9edad64034a9c8a121ec2b37792c190ba561e26)
HDFS-7185. The active NameNode will not accept an fsimage sent from the standby during rolling upgrade. Contributed by Jing Zhao.
MAPREDUCE-5970. Provide a boolean switch to enable MR-AM profiling. Contributed by Gera Shegalov
(cherry picked from commit f19771a24c2f90982cf6dec35889836a6146c968)
YARN-2312. Deprecated old ContainerId#getId API and updated MapReduce to use ContainerId#getContainerId instead. Contributed by Tsuyoshi OZAWA
(cherry picked from commit f93d2ea27e7554272845fb11d97b3564704834b3)
HADOOP-11181. GraphiteSink emits wrong timestamps (Sascha Coenen via raviprak)

(cherry picked from commit 466f08792f11c2f95bf293ac9b6facd7018a5bb8)
YARN-2496. Enhanced Capacity Scheduler to have basic support for allocating resources based on node-labels. Contributed by Wangda Tan.
YARN-2500. Ehnaced ResourceManager to support schedulers allocating resources based on node-labels. Contributed by Wangda Tan.

(cherry picked from commit f2ea555ac6c06a3f2f6559731f48711fff05d3f1)
YARN-2685. Fixed a bug in CommonNodeLabelsManager that caused wrong resource tracking per label when a host runs multiple node-managers. Contributed by Wangda Tan.

(cherry picked from commit b3056c266a628a65cf7ceb61b55ab3bd0a09baf2)
HDFS-7208. NN doesn't schedule replication when a DN storage fails.  Contributed by Ming Ma

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java
HDFS-5089. When a LayoutVersion support SNAPSHOT, it must support FSIMAGE_NAME_OPTIMIZATION.