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