Cherry pick spring-webmvc into release/0.16

Morris Esteparequested to merge
cherry-pick-27e4bd41 into release/0.16

Original MR: !312 (merged)

Edited by David Diederich

Merge request reports