Merge pull request #23780 from eclipse-ee4j/jdbc_cleanup

Small amount of cleanup for JDBC code