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

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