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