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