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

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