HBASE-7499 TestScannerTimeout timeout is too aggressive.

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1429458 13f79535-47bb-0310-9956-ffa450edef68
HBASE-7476 HBase shell count command doesn't escape binary output

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