Merge pull request #48 from zhfeng/JBTM-1697

JBTM-1697 AdvertiseUnadvertiseTest failed with  could not deploy queue
Revert "JBTM-1650 update to block reading from the socket until tpdiscon() sent the message in conversation"
JBTM-1684 update to check socket is close