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