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

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