don't use osgeo vmap0 server as it is unreliable
correct expected results for GD support
Merge branch 'branch-6-4'

Conflicts:
	gdal/expected/wmsclient.png
	renderers/expected/wmsclient.gif