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

This reverts commit e4565062eaec15649b4043b1849cdd654d131b8c.
Rebase from 'upstream'
Trimmed the branch to only the octomap_server sub directory