Merge branch 'aws-ci' into 'master'

Use AWS CI master

See merge request !28
16 jobs for master in 24 minutes and 58 seconds (queued for 2 seconds)