cleanup in custom variable overrides per build
work around https://github.com/travis-ci/travis-ci/issues/1769
fix gdal configure in absence of fgdb
Merge branch 'master' of github.com:mapnik/mapnik-packaging into osx-travis