DDF-155 Upgrade to GeoTools 11.0