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

This reverts commit bd0d4e39f08f6ea6798b051f6e5bb5dbe4555ff8.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the FrOctomap sub directory