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