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