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

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