Update some links previously pointing to the confluence site
Merge branch 'master' of git://github.com/geoserver/geoserver