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