Add correct mergeinfo for r302915.

It looks like I did the commit from the sys subdir and missed the mergeinfo
in the original commit.

Approved by: re (gjb, as part of r302915)