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