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

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