ref #7674 Adapt to cdmlib change(Add aggregated description to data set)
replace all occurrences of workingSet by descriptiveDataSet and fix some other compile errors after model change