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

IBM webmvc revert

See merge request !479

(cherry picked from commit eee2864c)

a6f08735 reverting webmvc changes
5f01f7ed Update pom.xml
2 jobs for !480 with cherry-pick-eee2864c in 2 minutes and 16 seconds (queued for 3 seconds)
latest merge request