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