OAuth JDBC tokens
Merge branch 'jdbcTokens'