repair visual tests to be able to round trip (undo bits that require 3.x support)
Merge branch '2.3.x' of github.com:mapnik/mapnik into 2.3-map-local-fonts
font-directory round tripping - refs ea5a46f23 && mapnik/Cascadenik#9 #1419