Merge pull request #14373 from schneems/schneems/jdbc-ar-2

Allow custom JDBC urls