YARN-1085. Addendum patch to address issues with the earlier patch. svn merge --ignore-ancestry -c 1517721 ../../trunk/