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