PROTON-2429: Fix merging error
PROTON-2429: Fix merging error

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