Merge pull request #306 from qiangdavidliu/2.x

Adding connection self termination for all BaseMessageConnections