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