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