Partially revert 1c20cfdf2403feb78cef515faf15c04d5c9f17bd

Not clear why update-dbix messed up the Jobsets and Projects
classes. This will probably happen again in the future...
Fix aggregate handling