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