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

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