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