Upgrade tomcat to 5.5.20

If the update is compatible with 5.5.18, let's do this quickly and see how the testsuites are affected. If needed, we'll rollback and defer the update to 4.0.6.CR1