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