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