Bug 31784 inroduces singleLibraryMode, but still sets singleBranchMode as well. We should clean this up.
See 31784