Upgrade HSQLDB.
Upgrade tomcat-jdbc.
Merge remote-tracking branch 'upstream/master'