Merge "rdbms: mention wait time in LoadBalancer::safeWaitForMasterPos() error logging"