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