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