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

IBM webmvc changes reverted

See merge request !328

(cherry picked from commit 8d98529b)

25e7edc2 IBM webmvc changes reverted 
2 jobs for !329 with cherry-pick-8d98529b in 2 minutes and 22 seconds (queued for 1 second)
latest merge request