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