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