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