Back-patched 3 small diffs from "future" hsqldb 2.2.8, MIGHT solve the intermittent HashIndex.java ArrayIndexOutOfBoundsException.