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

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