Update plain over SSL test
Merge branch 'master' into proto_dev