Update saml-login to use OpenJDK rather than Oracle's JDK.  Also
update Apache Tomcat to 7.0.42.

[Finishes #55343084]