AWS: Cherry pick to release 0.25 - Properly inject userId to execution context
Original MR: !506 (merged)
This fix for AWS the removal of the UserID header injection which was removed from the common code in !496 (diffs)
Edited by Guillaume Caillet