Merge branch 'stable-3.10' * stable-3.10: Adapt to replication api changes on stable-3.10 Specify cache.threads = 0 in the multi-site config documentation Change-Id: Iecad2b79e04c22d31da3f003174c799c20dacf55