Rebase from 'release/hydro/diagnostic_common_diagnostics'
Placing debian template files