spring-webmvc upgrade See merge request !356 (cherry picked from commit 1e067195) 5af37ab7 Squashed commit of the following b47dda9d Merge branch 'master' into 'aws-integration'