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