Merge branch 'aws-integration' into 'master'

spring-webmvc upgrade

See merge request !240

(cherry picked from commit 5c1d1af0)

34d9ac35 Squashed commit of the following 
31 jobs for cherry-pick-5c1d1af0 in 36 minutes and 24 seconds (queued for 4 seconds)
latest