Fix race condition in telnet transport teardown. (@Hodgestar)
Merge branch 'develop' into feature/issue-647-persistence-test-helper