Cherry pick spring-webmvc to release/0.16
spring-webmvc upgrade
See merge request !346 (merged)
(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'