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