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

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