Merge branch 'IBM-webmvc-revert' into 'master'

Shrikant Gargrequested to merge
cherry-pick-eee2864c into release/0.16

Original MR: !479 (merged)

Edited by David Diederich

Merge request reports