Fix AWS int tests internal failure. Update AWS bootstrap for use with internal CI.

Merged Matt Wise requested to merge feat/aws-impl into master

Merge request reports