VIVO-522 fix memory leak in FreemarkerConfigurationImpl
Merge branch 'maint-rel-1.6' into develop