HBASE-9398 Get HBASE-9190 to branck 0.95

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.96@1519094 13f79535-47bb-0310-9956-ffa450edef68