Rebase from 'release/groovy/bride'
Placing debian template files