HADOOP-10987. Provide an iterator-based listing API for FileSystem. Contributed by Kihwal Lee.
YARN-2730. DefaultContainerExecutor runs only one localizer at a time. Contributed by Siqi Li
(cherry picked from commit 6157ace5475fff8d2513fd3cd99134b532b0b406)
YARN-2798. Fixed YarnClient to populate the renewer correctly for Timeline delegation tokens. Contributed by Zhijie Shen.

(cherry picked from commit 71fbb474f531f60c5d908cf724f18f90dfd5fa9f)
YARN-2788. Fixed backwards compatiblity issues with log-aggregation feature that were caused when adding log-upload-time via YARN-2703. Contributed by Xuan Gong.

(cherry picked from commit 58e9f24e0f06efede21085b7ffe36af042fa7b38)
HDFS-7324. haadmin command usage prints incorrect command name. Contributed by Brahma Reddy Battula.
YARN-2795. Fixed ResourceManager to not crash loading node-label data from HDFS in secure mode. Contributed by Wangda Tan.

(cherry picked from commit ec6cbece8e7772868ce8ad996135d3136bd32245)
HDFS-7147. Update archival storage user documentation. Contributed by Tsz Wo Nicholas Sze.
YARN-1922. Fixed NodeManager to kill process-trees correctly in the presence of races between the launch and the stop-container call and when root processes crash. Contributed by Billie Rinaldi.

(cherry picked from commit c5a46d4c8ca236ff641a309f256bbbdf4dd56db5)
HDFS-7328. TestTraceAdmin assumes Unix line endings. Contributed by Chris Nauroth.

(cherry picked from commit 2bb327eb939f57626d3dac10f7016ed634375d94)
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2