EB-6981 - P1 fix for JDBC connection leak