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