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

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