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