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

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