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