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