Merge "Avoid preemptive DB replication waits for farm cross-wiki redirects"