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