ENG-6527: Fix up bad gating of catalog round-trip testing and join
order.