HBASE-8460 [replication] Fix the three TODOs in TestReplicationStateBasic.testReplicationQueues (Chris Trezzo)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1478104 13f79535-47bb-0310-9956-ffa450edef68
HBASE-8474 there are dups in hadoop2 pom

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