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