Bryan, thanks for your checking.
This patch seems simple and clean, and the tests run correctly in
my environment with the patch applied.
Committed to the trunk as revision 1145425.
Thank you for the contribution!
ij6 is converted in ToolScripts.java in 1.patch. And a empty line in ij6.sql is removed to keep the test pass.