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