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