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