Fix reloading for broker unit test failure
Merge pull request #3984 from kraman/bugfix2

Merged by openshift-bot