Issue #3441718 by mondrake: Fix string array keys in data sets returned by...

Issue #3441718 by mondrake: Fix string array keys in data sets returned by data provider methods that do not match the parameter names in Unit tests

(cherry picked from commit f4e9c070)