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