YARN-1979. TestDirectoryCollection fails when the umask is unusual. (Contributed by Vinod Kumar Vavilapalli and Tsuyoshi OZAWA)
(cherry picked from commit c7cee9b4551918d5d35bf4e9dc73982a050c73ba)
HDFS-7178. Additional unit test for replica write with full disk. (Arpit Agarwal)
YARN-2617. Fixed NM to not send duplicate container status whose app is not running. Contributed by Jun Gong
(cherry picked from commit 3ef1cf187faeb530e74606dd7113fd1ba08140d7)
YARN-2254. TestRMWebServicesAppsModification should run against both CS and FS. (Zhihai Xu via kasha)

(cherry picked from commit 5e0b49da9caa53814581508e589f3704592cf335)
YARN-2624. Resource Localization fails on a cluster due to existing cache directories. Contributed by Anubhav Dhoot
(cherry picked from commit 29f520052e2b02f44979980e446acc0dccd96d54)
HDFS-7162. Wrong path when deleting through fuse-dfs a file which already exists in trash (cmccabe)
(cherry picked from commit 03db9cc839663cad387db7df8e4f60b312058f18)
HDFS-7162. Fix CHANGES.txt (should have Chenging Liu's name)
HDFS-7179. DFSClient should instantiate a KeyProvider, not a KeyProviderCryptoExtension. (wang)

(cherry picked from commit d2d5a0ea03b0d461a4d376c7b9de8cd5c147effa)
HDFS-7181. Remove incorrect precondition check on key length in FileEncryptionInfo. (wang)

(cherry picked from commit 6ac10516e7fa28384b6d3c2670f6621e2666ffdb)
HADOOP-11160. Fix typo in nfs3 server duplicate entry reporting. Contributed by Charles Lamb.
YARN-2527. Fixed the potential NPE in ApplicationACLsManager and added test cases for it. Contributed by Benoy Antony.

(cherry picked from commit 1c93025a1b370db46e345161dbc15e03f829823f)
YARN-2628. Capacity scheduler with DominantResourceCalculator carries out reservation even though slots are free. Contributed by Varun Vasudev
(cherry picked from commit 054f28552687e9b9859c0126e16a2066e20ead3f)
HADOOP-11151. Automatically refresh auth token and retry on auth failure. Contributed by Arun Suresh.

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