(FR #1279) Preserve message headers when rejecting and requeuing

Change-Id: I6cb4e69342498ca9a33cbecc23791318892ac4c9
Merge "(FR #1279) Preserve message headers when rejecting and requeuing"