Merge branch 'kk/merge-octopus-optim'

The logic to determine that branches in an octopus merge are independent has been optimized. * kk/merge-octopus-optim: merge: use repo_in_merge_bases for octopus up-to-date check