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