Datasource: making sure we are having the same data field order when using mixed data sources. (#22718)

* changed so data query response always it returned in the correct order when using mixed data sources.

* refactored the code to make it a bit simpler and not failing the tests.

* changed to simple array type.

(cherry picked from commit f44c0f06)