Commit of mergeinfo only to record the fact that r270311 changes are in
10-stable (I did the commit to the wrong branch first).