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