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