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