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