offending servlet libs removed
trying to cache parameters, but that does not seem to make sense really...
Merge branch 'master' into max-file-size_38