YARN-1597. Fixed Findbugs warnings on branch YARN-321. Contributed by Vinod Kumar Vavilapalli. svn merge --ignore-ancestry -c 1557958 ../YARN-321