FABRIC-682 - fix MQDistroTest
FABRIC-682 - fix MQDistroTest - cleanup