Indigo sync preparations 2017-04-22

[tfoote]

I’ve identified two more issues that have come up:

Desktop has acquired a new dependency on simlulation indirectly. @sloretz

https://github.com/ros/metapackages/issues/13

And collada_urdf_jsk_patch

https://github.com/jsk-ros-pkg/jsk_3rdparty/issues/94