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