Ohad: For headpin, which only requires katello and candlepin, would it be the correct approach to break out the katello module into a common, katello, and katello-headpin module? Or, use some conditionals to do different includes? -- bk