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