Cherry pick spring-webmvc to release/0.16

Morris Esteparequested to merge
cherry-pick-ed42a222 into release/0.16

Original MR: !217 (merged)

Edited by David Diederich

Merge request reports