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