qpid-proton: rebased local changes to latest trunk