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