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