HDFS-7243. HDFS concat operation should not be allowed in Encryption Zone. (clamb via yliu)
YARN-2209. Replaced AM resync/shutdown command with corresponding exceptions and made related MR changes. Contributed by Jian He.

(cherry picked from commit 0f3b6900be1a3b2e4624f31f84656f4a32dadce9)
Updated CHANGES.txt to move YARN-2682 to branch-2.6
(cherry picked from commit 071c925c7dffbb825884a5df5a0104e7793b30fc)
HDFS-7258. CacheReplicationMonitor rescan schedule log should use DEBUG level instead of INFO level. Contributed by Xiaoyu Yao.