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