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

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