Passes correct payload for phase1Timeout messages

There was an issue where a phase1Timeout occured, but no payload passed
with it. The consumer of such a timeout used the payload and made it
available for later usage even, which then would unexpectedly fail.

Now, wherever applicable, the correct payload is sent with such timeout
messages.

co-author: Rickard Öberg, @rickardoberg
Merge pull request #1699 from tinwelint/2.0-timeout-payload-fix

Passes correct payload for phase1Timeout messages