HBASE-8984 Test online snapshots with online merge

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.95@1505791 13f79535-47bb-0310-9956-ffa450edef68
HBASE-9007 TestReplicationKillSlaveRS.killOneSlaveRS fails; ADDENDUM/FIX

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.95@1505804 13f79535-47bb-0310-9956-ffa450edef68
HBASE-9012 TestBlockReorder.testBlockLocationReorder fails

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.95@1505807 13f79535-47bb-0310-9956-ffa450edef68
HBASE-9018 Add timeouts on all tests in TestHLogSplit

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