Rebase from 'debian/hydro/test_diagnostic_aggregator'
Generated debian files for quantal