Merge branch 'cs/#6916-remove-unused-db-variable-in-db2-select-decorator'

Close #6916
Fix: More unused local variables
Merge branch 'cs/#6915-zend-db-metadata-source-sqlite-metadata-unused-properties' into develop

Close #6915
Forward port #6915