[mkgmap-dev] Consolidation of mkgmap changes