Fixes #259 fallback to servlet context init parameters
Merge branch '2.2.x_2.9' into 2.2.x_2.10