2.4 rewritebase

[Eric Covener]

I am on the road right now, but a user reported that my fix to make
rewritebase merging opt-in is busted and breaks normal override by default.
Can someone look/repair/propose for 24?