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