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