v.21.1Bug Fixes

Fix QueryPipeline Exception from Merging Expression Steps

Fix possible exception QueryPipeline stream: different number of columns caused by merging of query plan's Expression steps. Fixes #18190. #18980 (Nikolai Kochetov).