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

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