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