adapter testsuite port and adapter fixes
Merge remote-tracking branch 'upstream/master'
Merge pull request #878 from patriot1burke/master

adapter testsuite port