svn merge -c 1575021 from trunk for HDFS-6060. NameNode should not check DataNode layout version


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576149 13f79535-47bb-0310-9956-ffa450edef68