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