HBASE-9425 Starting a LocalHBaseCluster when 2181 is occupied results in "Too many open files"


git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.96@1523810 13f79535-47bb-0310-9956-ffa450edef68
HBASE-9541 icv fails w/ npe if client does not support cellblocks

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