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