VIVO-491 cleaning up some minor address stuff
inverse predicate method now working
Merge branch 'maint-rel-1.6' into develop