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