Fixed FaultToleranceTest.MasterFailover test.

Review: https://reviews.apache.org/r/14917
Fixed DuplicateTerminalUpdateAfterAck test.

Review: https://reviews.apache.org/r/14918