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

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