Crazy proposal: after we upgrade to 5.0, we move to running off Bugzilla master. Each patch would be applied to bmo as well.