Fix JDBC sink to have its own DataSource

Parent commits are part of another pull request #420
so please merge those first and rebase/cherry pick.