Merge "Fixing jdbc code: correct PreparedStatement closing" into stable-2.8