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