BATCH-1968: Upgrade to hsqldb 2.2.9