Merge branch 'aws-integration' into 'master'

spring-webmvc upgrade

See merge request !346

(cherry picked from commit 04aedb6d)

8aa240d4 Squashed commit of the following:
d727231e Merge branch 'master' into master-dev-merge
aa0fca42 merge master.
7773c242 Merge branch 'master' into master-dev-merge
d451b476 Squashed commit of the following 
daca897a Merge branch 'master' into master-dev-merge
cfa5403d Merge branch 'master' into 'aws-integration'
32 jobs for cherry-pick-04aedb6d in 85 minutes and 28 seconds (queued for 3 seconds)
latest