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