Fix a few headers that got left out in the cold
Merge branch 'master' of git://github.com/geoserver/geoserver