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