Aws xuserid fix

Merged Rucha Deshpande requested to merge aws-xuserid-fix into master

Merge request reports