HBASE-8842 TestTokenAuthentication failing on hadoop2 build with "IllegalArgumentException: Can t get Kerberos realm"

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.95@1499135 13f79535-47bb-0310-9956-ffa450edef68
HBASE-8854 TestScannersFromClientSide.testScanBatch failed with 'There should have room before prefetching is submitted'

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.95@1499137 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/0.95' into 0.95-gd