Update to GeoTools 8.4