Add option to override expire clients for tile layer
Handmade merge with http://jira.codehaus.org/browse/GEOS-6020
Merge branch 'master' into expireClients
GEOS-6080: added standard RoleSource support (Header, RoleService, UserGroupService) to J2EEAuthenticationFilter
GEOS-6080: added more docs to MigrationHelper
Default JDBCConfig to disabled
JDBCConfig documentation updates
Merge pull request #366 from mbarto/geos6080_j2eefilter_roleservice_2

GEOS-6080: added standard RoleSource support (Header, RoleService, UserGroupService) to J2EEAuthenticationFilter
Merge branch 'master' of https://github.com/geoserver/geoserver into expireClients
Forgot to unset transient members from patch
fixed cas extension broken by GEOS-6080
Merge pull request #370 from mbarto/geos6080_fix_cas

fixed cas extension broken by GEOS-6080
Update web.xml

add JSONP Config
Merge pull request #371 from g3o/patch-1

Update web.xml
add LDAP config

adds a section for configuring ORACLE ds with LDAP and referrals (if needed)
Merge pull request #369 from smithkm/jdbcconfig

JDBCConfig disabled by default
Merge pull request #315 from sweco-sebhar/expireClients

Add option to override expire clients for tile layer
Add wfs-notification module from 2.4 to master.
Merge pull request #372 from g3o/patch-2

add LDAP config
Merge pull request #374 from dustinparker/wfs-notification-master

Add wfs-notification module from 2.4 to master.