Cleanup test ssh server.
Merge branch 'develop'