Bug 17829: (followup) Fix small rebasing errors