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