Updates for incoming jdbc changes.
Merge branch 'master' of git://github.com/lnostdal/SymbolicWeb
Various..