ref #7674 Enhance sorting of matrix rows
replace all occurrences of workingSet by descriptiveDataSet and fix some other compile errors after model change