Merge "Fix jdbc code: Both PreparedStatements must be closed in any case" into stable-2.8