remove all traces of JDBC - R.I.P friend
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'