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

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