Merge branch 'aws-integration' into 'master'

spring-webmvc upgrade

See merge request !302

(cherry picked from commit bcded487)

a31fa2a7 spring-webmvc upgrade
32 jobs for cherry-pick-bcded487 in 39 minutes and 23 seconds (queued for 2 seconds)
latest