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