defer catalog / uncatalog for deferred connection

See merge request !2043
6 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 0 seconds