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