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

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