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