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