YARN-1866. Fixed an issue with renewal of RM-delegation tokens on restart or fail-over. Contributed by Jian He. svn merge --ignore-ancestry -c 1581448 ../../trunk/