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