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