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