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