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