Revert "Trimmed the branch to only the jsk_ros_patch/collada_urdf_jsk_patch sub directory"

This reverts commit df32b0e832562800009ca6f87e6f931c8b09c490.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the jsk_ros_patch/collada_urdf_jsk_patch sub directory