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