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