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

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