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