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

This reverts commit cac3eca6b3ff56f29459f515f9f42eb832fff950.
Rebase from 'upstream'
Trimmed the branch to only the jsk_ros_patch/collada_urdf_jsk_patch sub directory