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