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

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