move ct_with_advisory_lock to _ct.with_advisory_lock and rebuilders into HierarchyMaintenance