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

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