YARN-1883. Merged into branch-2.4 also.
svn merge --ignore-ancestry -c 1582862 ../../trunk/ onto branch-2.4.
Fixed CHANGES.txt entries too.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1586766 13f79535-47bb-0310-9956-ffa450edef68
YARN-1907. Merged into branch-2.4 also.
svn merge --ignore-ancestry -c 1585992 ../../trunk/ onto branch-2.4.
Fixed CHANGES.txt entries too.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1586767 13f79535-47bb-0310-9956-ffa450edef68
HDFS-6232. OfflineEditsViewer throws a NPE on edits containing ACL modifications (ajisakaa via cmccabe)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1586793 13f79535-47bb-0310-9956-ffa450edef68