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