YARN-2260. Fixed ResourceManager's RMNode to correctly remember containers when nodes resync during work-preserving RM restart. Contributed by Jian He. svn merge --ignore-ancestry -c 1610557 ../../trunk/