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

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