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

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