Resynced pr2_moveit_config to new Setup Assistant, manually diff-ed all changes