Set x-amz-id-2 and x-amz-request-id headers based on Swift txid

Change-Id: I6ea2640ad8ba4fbeccc2c57193ff03da762942cc
Merge "Set x-amz-id-2 and x-amz-request-id headers based on Swift txid"