using direct reference to Catalog to avoid startup race condition
Merge branch 'master' of git://github.com/geoserver/geoserver