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