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