YARN-1933. Fixed test issues with TestAMRestart and TestNodeHealthService. Contributed by Jian He. svn merge --ignore-ancestry -c 1587104 ../../trunk/