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