Rebase from 'release/jade/catkin'
Placing rpm template files