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

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