Do not geocode while merging

Currently while merging there is a call to BAO_Address::fixAddress - this hurts performance, wastes (limited) geocoding calls & can result in conflicts being calculated where there are none (although in this last case there are other issues)

The fixAddress line is called IMMEDIATELY before the pre hook & I think it makes sense to pull the geocoding portion into a function called by the pre hook (which would not be called while doing deduping). I would also note it helps to be able to opt out of geocoding separately to opting out of 'fixAddress' which does other (mysterious) things at the same time. Fun fact I added a code comment once to that function saying 'what does this do' and someone edited it to say it fixes the address - but gave no detail as to what that means