Jdbc enhancements

Merge all of the consolidated JDBC stuff to master.  Everything has been reviewed, just waiting on the merge from master to here to turn blue before pushing the merge to master button.