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

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