Upgrade HSQLDB version to 2.3.1

Issue #533
Merge branch 'develop' into feature-sitemaps