JCR-2096: Upgrade to HSQLDB 2.2.9