Import from Tomcat 6.0.39
Add extra properties support