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