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