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