Merge pull request #1802 from jbertram/master

don't use deprecated 'protocol' transport configuration property in our test-suite
stabilize a couple tests that are failing