Use same groovyPagesTemplateEngine bean in development for consistency
Fixing issue with fields plugin template overrides
Cleanup