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