Feature/jorgen.lind/disable aws

Merged Jørgen Lind requested to merge feature/jorgen.lind/disable_aws into master

Merge request reports