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

This reverts commit 37624d1be47d3a371c7661c67306faea7b443f6e.
Rebase from 'upstream'
Trimmed the branch to only the octomap sub directory