CORS Fix, AWS Updates

Merged Spencer Sutton requested to merge aws-integration2 into master

Merge request reports