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