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