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