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