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

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