HHH-8869 fixes/simplifications for HikariCP 1.3.4