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