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