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