HBASE-8895 Misc: replace hbase.client.retries.number w/ define and remove unused imports

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1500988 13f79535-47bb-0310-9956-ffa450edef68
HBASE-8895 Misc: replace hbase.client.retries.number w/ define and remove unused imports; ADDENDUM -- OVERCOMMIT to POM.XML

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1500990 13f79535-47bb-0310-9956-ffa450edef68
HBASE-8895 Misc: replace hbase.client.retries.number w/ define and remove unused imports; ADDENDUM UNDO OVERCOMMIT IN RECOVERABLEZOOKEEPER

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1501003 13f79535-47bb-0310-9956-ffa450edef68
HBASE-8900 TestRSKilledWhenMasterInitializing.testCorrectnessWhenMasterFailOver is flakey

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