PROTON-2397: test fixes and extra test
PROTON-2397: test fixes and extra test

gemmellr/qpid-proton,gemmellr/qpid-proton,astitcher/qpid-proton,apache/qpid-proton,apache/qpid-proton,astitcher/qpid-proton,ChugR/qpid-proton,apache/qpid-proton,gemmellr/qpid-proton,apache/qpid-proton,astitcher/qpid-proton,ChugR/qpid-proton,ChugR/qpid-proton,gemmellr/qpid-proton,astitcher/qpid-proton,ChugR/qpid-proton,apache/qpid-proton,ChugR/qpid-proton,gemmellr/qpid-proton,astitcher/qpid-proton,gemmellr/qpid-proton,apache/qpid-proton,ChugR/qpid-proton,astitcher/qpid-proton