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