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