GEOS-5533: fixed critical bug in FreemarkerTemplateResource
Merge branch 'master' of git://github.com/geoserver/geoserver