Merge branch 'aws-ci' into 'master'

update aws settings.xml

See merge request !25
17 jobs for master in 65 minutes and 40 seconds (queued for 2 seconds)