added test that server and client using same protocol
Merge branch 'upstream' into add/protocol-check
Merge pull request #1489 from kevin-roark/add/protocol-check

added test that server and client using same protocol