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

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