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