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

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