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