Rebase from 'release/groovy/master_discovery_fkie'
Placing debian template files