Isolate and refactor broker controllers for better maintainability

Commits from 68a3302 onwards are part of this request, the first 4 are part of another pull that needs to go in first.

Includes https://github.com/openshift/li/pull/844