Make the binding recovery test run in the main broker.
merge bug24249 into junk