added some more properties to the configuration
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
updated version to 9.1.0-SNAPSHOT