Merge branch 'cs/#6914-remove-oci8-driver-unused-parameters'

Close #6914
remove unnecessary variables
Merge branch 'cs/#6921-remove-unused-variable-assignments' into develop

Close #6921
Forward port #6921
fix BC for #6890 and c91bd9be56e0b194beedde4c78be943591cdc719