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