VIVO-550 and VIVO-551 migration improvements
update geo focus map to use localName first, then label
Merge branch 'maint-rel-1.6' into develop