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