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