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

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