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