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