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