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