Fix problem with tomcat 7.0.52 and JSP EL properties
Fixes #227
Merge branch 'master' into multitenant