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

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