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