merge up to trunk (revision 732908)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/branches/0.19_on_hadoop_0.18@732909 13f79535-47bb-0310-9956-ffa450edef68
26 files changed