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