CLC-2904 - Disconnect button doesn't work
https://jira.media.berkeley.edu/jira/browse/CLC-2904
Merge pull request #1866 from christianv/CLC-2904

CLC-2904 - Disconnect button doesn't work