rebase on latest version
Merge pull request #1056 from tdawson/tdawson/fed-update/broker-util-1.2.4

Merged by openshift-bot