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

This reverts commit 4c4d2aac0653c4f2f783561133d96c7726f3950a.
Rebase from 'upstream'
Trimmed the branch to only the octomap_mapping sub directory