Fix properties file configuration for servlet context
Add missing configuration property
Merge branch 'customization' into integration