Stop hardcoding journal brokers everywhere

Use a variable with the proper brokers instead

Test Plan

sensible octocatalog-diff output

---

Migrated from D1599 (view on Phabricator)