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