bug 1343: Properly terminate the CommModule when rquested
Merge branch 'bug-1343' into testserver-stable