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