Fix remaining headers from porting GeoServer processes over to GeoTools

Signed-off-by: Jody Garnett <jody.garnett@gmail.com>
Merge branch 'master' of git://github.com/geotools/geotools