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