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