YARN-1686. Fixed NodeManager to properly handle any errors during re-registration after a RESYNC and thus avoid hanging. Contributed by Rohith Sharma. svn merge --ignore-ancestry -c 1571474 ../../trunk/