Upgrade to GeoTools 10-SNAPSHOT