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