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