HDFS-7552. Change FsVolumeList toString() to fix TestDataNodeVolumeFailureToleration (Liang Xie via Colin P. McCabe)
(cherry picked from commit a4876c130f1627e59ef055e586640d1933fc49af)
MAPREDUCE-6045. need close the DataInputStream after open it in TestMapReduce.java (zxu via rkanter)

(cherry picked from commit d9e4d67d18811e16d5b0a76ea8228d333ded195f)
HADOOP-11422. Check CryptoCodec is AES-CTR for Crypto input/output stream (Yi Liu via Colin P. McCabe)
(cherry picked from commit e369d98ba24906abcb35c0906cd57750c0d21fdb)
HDFS-7443. Datanode upgrade to BLOCKID_BASED_LAYOUT fails if duplicate block files are present in the same volume (cmccabe)
(cherry picked from commit 8fa265a290792ff42635ff9b42416c634f88bdf3)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
HADOOP-11213. Typos in html pages: SecureMode and EncryptedShuffle. (Wei Yan via kasha)

(cherry picked from commit 6f1e3667cff3e95f33ba14a3cb7d1e99518d502a)
YARN-2738. [YARN-2574] Add FairReservationSystem for FairScheduler. (Anubhav Dhoot via kasha)

(cherry picked from commit a22ffc318801698e86cd0e316b4824015f2486ac)
MAPREDUCE-6199. AbstractCounters are not reset completely on deserialization (adhoot via rkanter)

(cherry picked from commit 390a7c12f543b2c94a74f08d6d2a28410472043a)
YARN-2675. containersKilled metrics is not updated when the container is killed during localization. (Zhihai Xu via kasha)

(cherry picked from commit 954fb8581ec6d7d389ac5d6f94061760a29bc309)
YARN-2952. Fixed incorrect version check in StateStore. Contributed by Rohith Sharmaks
(cherry picked from commit 808cba3821d5bc4267f69d14220757f01cd55715)
HADOOP-11395. Add site documentation for Azure Storage FileSystem integration. (Contributed by Chris Nauroth)
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2