Merge hikaricp changes into hikaricp-java6.