Merge branch 'stable-3.5' into stable-3.6 * stable-3.5: Do not rely on async/wait for synchronous fetch replication Cover the replication failure scenario and fix the metrics Remove white-box unit tests on synchronous FetchCommand Throw Exception from tests Change-Id: Ib51ef135049a2fceed1246886ce22efdd1a67c8a