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