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