Change algorithm in RoadMerger that it preserves a stable order. Also fix the junit tests.

git-svn-id: http://svn.mkgmap.org.uk/mkgmap/trunk@2943 25d90789-57f7-4ee0-8453-03a3dfeeeb22