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