VIVO-541 Tweaks to the .ftl and .js
Merge branch 'maint-rel-1.6' into develop