Merge non-fast-forward for release branch merges