tomcat 7.0.42

Closes #21189.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>