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

This reverts commit 0e5f78d16b48482a22dc40eb0b4068763b40aa63.
Rebase from 'upstream'
Trimmed the branch to only the urdf sub directory