Sorry, this is a bit of a messy commit, comprising more than one thing.

Not even all of the changes are mine, because there were uncommitted changes from Harrie.
The main thing is to add data collection for trunk manager defect tracking.
It also comments out the DDD collection, because that is currently broken.