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