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