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