Merge branch 'demo/aws' into 'develop'

testing in AWS environment

See merge request !12
1 job for 24-refactor-streamadminservice-to-controller-logic in 1 minute and 26 seconds (queued for 8 seconds)