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