Rebase from 'release/indigo/people_tracking_filter'
Placing rpm template files