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