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


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442641 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'branch-2' of github.com:griddynamics/yhadoop-common into branch-2-gd
Merge branch 'branch-2-gd' of github.com:griddynamics/yhadoop-common into fb-YAHOO-162-branch-2-gd