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

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