Fixing AWS Build

Merged Marc Burnie [AWS] requested to merge aws-integration into master

Merge request reports