Changed the caching of FieldDataSource in aggs to be based on field name...

... + required Value Source type as a combi key (used to be only field name). This fixes a problem where multiple aggregations where defined on the same field, yet require different types of value sources.

Closes #5190