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

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