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