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