MAPREDUCE-5261. Fix issues in TestRMContainerAllocator after YARN-617. Contributed by Omkar Vinit Joshi. svn merge --ignore-ancestry -c 1485079 ../../trunk/