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