Cherry pick spring-webmvc to release/0.16

spring-webmvc upgrade

See merge request !188 (merged)

(cherry picked from commit 61a38934)

c5acf12d Squashed commit of the following 3a77ff4b Merge branch 'master' into 'aws-integration'