Remove orphan hack for Commits.QueryBy()
Restore support to filter since current orphan branch
Teach BranchUpdater to set merge branch directly