updates for rep 140

Depends on ros-infrastructure/catkin_pkg#88 being merged and released.