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

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