[mkgmap-dev] Commit r4824: partly revert r4822, it breaks unit tests (problem with junit?)