Extract formatLocationBlock from import parsing

Extract formatLocationBlock from import parsing

Next steps here are to remove the markIncomplete in testImportPrimaryAddress
and get Primary importing working on Phone & then email and to
call this extracted function instead of ->formatContactParameters(, );
when we are formatting a location (for code simplification as formatContactParameters
effectively just calls this but from much lower down