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