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