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

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