Conflicts: hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java Amending-Author: Andrew Purtell <apurtell@apache.org>