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

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