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

This reverts commit a5c272db0cae7ee8054c61febbe3dd8853cd9624.
Rebase from 'upstream'
Trimmed the branch to only the froctomap sub directory