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