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