Pegged master to 2.3.5 and geotools 9.5