HDFS-6617. Flake TestDFSZKFailoverController.testManualFailoverWithDFSHAAdmin due to a long edit log sync op. Contributed by Liang Xie.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1608522 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-10782. Fix typo in DataChecksum class. Contributed by Jingguo Yao.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1608539 13f79535-47bb-0310-9956-ffa450edef68