Merge branch 'aws-integration' into 'master'

spring-webmvc upgrade

See merge request !274

(cherry picked from commit c44ec5e8)

141522f6 Squashed commit of the following 
336cff8a Merge branch 'master' into 'aws-integration'