Workunit split

Akthough cluster was/is a member of QueryDataSource, it isn't used anywhere afaics.. so could be removed and queryClusterName() could be passed to setClusterName directly.