merge up to latest trunk (rev 730494)

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