Introduce HSQLDB for tests.
Merge conflict.