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