master: Untangling database issues. My model is messed up, apparently. Had to add some null checks to DBCP connector, but suprisingly it works. Fixed the validate query for HSQLDB, which isn't super friendly.