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

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