VIVO-727 fixes bugs with VCard migration
Merge branch 'maint-rel-1.6' into develop