Added new MergingDataSetDefinition with associated evaluator so that we can have non-cohort indicators in the same data set as the rest of the 731 indicators