HBASE-8876 Addendum to HBASE-8774 Add BatchSize and Filter to Thrift2 - Add BatchSize Test

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1500035 13f79535-47bb-0310-9956-ffa450edef68
HBASE-8814 Possible NPE in split if a region has empty store files; REVERT AGAIN (2nd TIME)

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