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

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