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