MAPREDUCE-3345. Fixed a race condition in ResourceManager that was causing TestContainerManagerSecurity to fail sometimes. Contributed by Hitesh Shah. svn merge -c r1199144 --ignore-ancestry ../../trunk/