Rebase from 'release/indigo/zeroconf_avahi'
Placing debian template files