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