I'm looking at the possibility of Backporting this fix to 2.4, and I'm wondering about this file.  Was this a case of a workaround that the fix made unnecessary, or is it actually part of the fix?  I'd prefer to narrow what I propose to backport down to just the JDBCConfig module if I can.