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