svn merge -c 1341676 from trunk for HDFS-3415. Make sure all layout versions are the same for all storage directories in the Namenode.