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