Merge branch 'stable-3.10' into stable-3.11 * stable-3.10: Introduce tests for ReplicationTaskId thread-local Introduce ReplicationTaskId as thread-local Change-Id: I5d2b50a8500d0a837a9c8b9c60bd5e72f49bba7a