Rebase from 'debian/hydro/effort_controllers'
Generated debian files for quantal