GEOS-5755 Support Local Resolve in App-Schema
Merge branch 'master' of git://github.com/geoserver/geoserver