VIVO-387: clean up post-migration issues
VIVO-387: clean up post-migration issues
Merge branch 'maint-rel-1.6' into develop