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