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