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