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