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