Improve the test support class' ability to restart a broker and retain
all previous port mappings.