Fix broker extended tests
Merge pull request #3919 from pravisankar/dev/ravi/fix-broker-extended

Merged by openshift-bot