Revert "Trimmed the branch to only the octomap sub directory"

This reverts commit 0f8aac82399c888333015f0b0d53c6e755fa0b12.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the octomap sub directory