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