Move new encoding parameter to be on last position for backwards compatibility. Include OCI Driver into changes.