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