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