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