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