Bug 895878 - Added support for broker's new 24 character uuid

* retained support for 32 character uuid's as well
Merge pull request #1296 from jwhonce/dev/bz895878

Merged by openshift-bot