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