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