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