HDFS-5526. Datanode cannot roll back to previous layout version. Contributed by Kihwal Lee.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1545322 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch: upstream/trunk