updates for VIVO-413 and VIVO-409
Merge branch 'maint-rel-1.6' into develop
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop