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