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