I'm not sure why this appeared in this PR, but has to do with the more recent PR here: https://github.com/ros-planning/moveit_core/pull/152. I'll try to sync branches now.