miscellaneous cleanup but includes a fix for VIVO-404
Merge branch 'maint-rel-1.6' into develop