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

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