Merge pull request #1200 from gaohoward/howard-tmp-from-clebert

Howard tmp from clebert
Little refactoring on tests to help reuse replicated config from FailoverTestBase
debug statements - do not check this