These two patches are in 4.0.18, so can be deleted

The people linking patch is on 4.0-trunk but not yet in a release.