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