YARN-1625. Fixed RAT warnings after YARN-321 merge. Contributed by Shinichi Yamashita. svn merge --ignore-ancestry -c 1561458 ../../trunk/