Update with latest Groovy templates support

Those changes are based on a private branch featuring the current work
on Groovy MarkupTemplate support in Spring Framework.