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