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