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