HBASE-9123 Filter protobuf generated code from long line warning (Ted Yu)



git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1511846 13f79535-47bb-0310-9956-ffa450edef68
HBASE-9156  2000ms timeout for some client calls

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