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