The previous patch set had an error and one development branch's changes showed up twice, and two different change sets. So it was missing the bulk of the configuration work. This patch set fixes that.