VIVO-441: template and .properties updates
Merge branch 'maint-rel-1.6' into develop