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