svn merge -c 1442639 FIXES: HADOOP-9260. Hadoop version may be not correct when starting name node or data node. Contributed by Chris Nauroth