Synchronize HikariCP-java6 code with HikariCP for pull request #113