Backport JDBCConfig fixes and improvements: #308, #329, #335, #350, #369
Merge pull request #378 from smithkm/jdbcconfig-backport2

Backport JDBCConfig fixes and improvements: #308, #329, #335, #350, #369