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