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