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