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

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