Tidy up manifests; remove duplicate javax.servlet classes from el jar.