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

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