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