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