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