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