Merge branch 'stable-3.7' into stable-3.8 * stable-3.7: Log stacktrace when replication fails Change-Id: I41cc9b726f73c7e4ec63a0ac5140ed664c7da4ec