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