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

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