Remove expiration property from dead lettered messages
add original expiration to x-death headers on per-message-ttl expiry
do not attempt to parse expiration from missing properties
Cosmetic.
allows log the per-msg-ttl if it is present
Simplify (and don't bother parsing to integer only to convert back).
Merge bug25588
Merge heads of stable