Merge "Use new per-connection SQL for loading collators." into rvc-dev