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

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