svn merge -c 1490704 FIXES: YARN-760. NodeManager throws AvroRuntimeException on failed start. Conributed by Niranjan Singh