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