Bug 23321: Allow setting of branch default