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