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