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