Properly inject userId to execution context

Guillaume Cailletrequested to merge
aws-fix-user-context into master

AWS Change only.

Fix for AWS the changes done in !496 (diffs)

Merge request reports