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