PROTON-394 and PROTON-404: fixed head of line blocking issue in proton-c and fixed delivery-id sequence for proton-j; both these issues where exposed by the same test