YARN-2152. Added missing information into ContainerTokenIdentifier so that NodeManagers can report the same to RM when RM restarts. Contributed Jian He. svn merge --ignore-ancestry -c 1605205 ../../trunk/