Applying an important change suggest by moveit developers (same as https://github.com/tork-a/rtmros_nextage/issues/46).