VIVO-711 trapping for invalid URIs generated in the migration
Merge branch 'maint-rel-1.6' into develop