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