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