Rebase from 'release/hydro/desktop'
Placing debian template files