fix(import): Make sure query context is overwritten for overwriting imports#25493

eschutho merged 2 commits intoapache:masterapache/superset:masterfrom

preset-io:jack/fix-for-old-datasource-ids-importpreset-io/superset:jack/fix-for-old-datasource-ids-importCopy head branch name to clipboard