v.21.1Bug Fixes

Fix optimization of group by with optimize_aggregators_of_group_by_keys and joins

Fix optimization of group by with enabled setting optimize_aggregators_of_group_by_keys and joins. Fixes #12604. #16951 (Anton Popov).