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