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