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