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