HBASE-9106 Do not fail TestAcidGuarantees for exceptions on table flush

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.95@1509536 13f79535-47bb-0310-9956-ffa450edef68
HBASE-9085 Integration Tests fails because of bug in teardown phase where the cluster state is not being restored properly. (gautam) 

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