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