YARN-493: correct merge error that caused TestNodeManagerShutdown to hang