EDIT

ref #9801, ref #7980, ref #8871 remove aggregated source descriptions from aggregation and fix persistence issues

cleanup

ref #9772 add deproxy to collector title computation

change line number for debugging

ref #7980 fix concurrent modification exception

cleanup

ref #7980 fix NoSuchElement exception (cont.)

ref #9772: adapt collectorstring, use collectorTitleCache

ref #7980 fix NoSuchElement exception

update Datasource script