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