Support new JDBC configuration style.
Merge branch 'v1' into v2