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