Merge branch 'stable-3.5' into stable-3.6 * stable-3.5: Log stacktrace when replication fails Change-Id: I51f1316cc242535cd8e79a2b35c2ee4f939b3ffc