Signed-off-by: Andrew Purtell <apurtell@apache.org> Conflicts: hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java