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

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