Remove erroneously commited code
Add Groovy markup templating support to the MVC config

Issue: SPR-11998
Polish
Increase timeout in integration test