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