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