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