Merge spring-webmvc changes to release/0.16

Morris Esteparequested to merge
cherry-pick-2cdaf25a into release/0.16

upgrade spring-webmvc

See merge request !234 (merged)

(cherry picked from commit 2cdaf25a)

8dac1cff Squashed commit of the following

Merge request reports